Fix RC assertion in fpm when php_admin_value setting fails #19671
+50
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The value is temporarily duplicated. While the value is allocated persistently, it will be freed if the ini value can't be set. This is safe, given the value has not actually been stored. Exposed by phpGH-19619
TimWolla
reviewed
Sep 3, 2025
Comment on lines
+44
to
46
| /* The string wasn't installed and won't be shared, it's safe to drop. */ | ||
| GC_MAKE_PERSISTENT_LOCAL(duplicate); | ||
| zend_string_release_ex(duplicate, 1); |
There was a problem hiding this comment.
Alternatively, zend_string_free() might be a little more explicit in that “this is expected to be RC 1 at this point”?
There was a problem hiding this comment.
I'd honestly prefer not to change behavior for the patch. Should be ok for master.
bukka
approved these changes
Sep 3, 2025
TimWolla
approved these changes
Sep 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The value is temporarily duplicated. While the value is allocated persistently, it will be freed if the ini value can't be set. This is safe, given the value has not actually been stored.
Exposed by GH-19619
See https://github.com/php/php-src/actions/runs/17390733646/job/49364059680.